From: Debian LibreOffice Maintainers <debian-openoffice@lists.debian.org>
Date: Wed, 28 Jan 2026 20:03:25 +0000 (+0100)
Subject: system-crates
X-Git-Tag: archive/raspbian/4%26.2.0-1+rpi1^2~9
X-Git-Url: https://dgit.raspbian.org/%22http:/www.example.com/%22mailto:kde%40ewsoftware.de/%22style.css//%22node%24level1.html/%22/%22http:/www.example.com/%22mailto:kde%40ewsoftware.de/%22style.css/%22node%24level1.html/%22?a=commitdiff_plain;h=de96d130676e35fe7719b637567b6b79dec53a8d;p=libreoffice.git

system-crates


Gbp-Pq: Name system-crates.diff
---

diff --git a/Makefile.fetch b/Makefile.fetch
index 64c15b67b64..e88ec4928ff 100644
--- a/Makefile.fetch
+++ b/Makefile.fetch
@@ -256,8 +256,10 @@ $(WORKDIR)/download: $(BUILDDIR)/config_$(gb_Side).mk $(SRCDIR)/download.lst $(S
 		$(call fetch_Optional,OFFICEOTRON,OFFICEOTRON_JAR) \
 	,$(call fetch_Download_item,https://dev-www.libreoffice.org/extern,$(item)))
 	-@mkdir -p $(TARFILE_LOCATION)/cargo
+	$(if $(filter TRUE,$(SYSTEM_YRS)), \
 	$(if $(call fetch_Optional,YRS,1),\
-		CARGO_HOME=$(TARFILE_LOCATION)/cargo cargo fetch $(if $(verbose),--verbose,) --locked --manifest-path $(SRCDIR)/external/y-crdt/Cargo.toml)
+		CARGO_HOME=$(TARFILE_LOCATION)/cargo cargo fetch $(if $(verbose),--verbose,) --locked --manifest-path $(SRCDIR)/external/y-crdt/Cargo.toml) \
+	)
 	@mkdir -p $(dir $@) && touch $@
 	@mkdir -p $(dir $@)/Executable
 
diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk
index 17543065dcb..8b5863ebf9e 100644
--- a/RepositoryExternal.mk
+++ b/RepositoryExternal.mk
@@ -4547,6 +4547,7 @@ endif
 
 ifneq ($(WITH_YRS),)
 
+ifeq ($(SYSTEM_YRS),)
 define gb_LinkTarget__use_yrs
 $(call gb_LinkTarget_use_external_project,$(1),y-crdt)
 $(call gb_LinkTarget_set_include,$(1),\
@@ -4569,6 +4570,16 @@ endef
 
 else
 
+define gb_LinkTarget__use_yrs
+$(call gb_LinkTarget_set_include,$(1),\
+	$$(INCLUDE) \
+)
+$(call gb_LinkTarget_add_libs,$(1),$(SRC_ROOT)/debian/cargo_registry/yffi/target/$(DEB_HOST_RUST_TYPE)/$(CARGO_CHANNEL)/libyrs.a)
+endef
+endif
+
+else
+
 gb_LinkTarget__use_yrs :=
 
 endif
diff --git a/config_host.mk.in b/config_host.mk.in
index 22bca59f7d9..b15034f5779 100644
--- a/config_host.mk.in
+++ b/config_host.mk.in
@@ -748,6 +748,7 @@ SYSTEM_WPD=@SYSTEM_WPD@
 SYSTEM_WPG=@SYSTEM_WPG@
 SYSTEM_WPS=@SYSTEM_WPS@
 SYSTEM_XMLSEC=@SYSTEM_XMLSEC@
+SYSTEM_YRS=@SYSTEM_YRS@
 SYSTEM_ZLIB=@SYSTEM_ZLIB@
 SYSTEM_ZSTD=@SYSTEM_ZSTD@
 SYSTEM_ZMF=@SYSTEM_ZMF@
diff --git a/configure.ac b/configure.ac
index 4d039c1c49b..026f8c7af8f 100644
Binary files a/configure.ac and b/configure.ac differ